Move addition of positional embeddings into function

Move addition of positional embeddings into function #118