Seperating of Buffer and Element logic
Removes pointless return values