Improve internal flow of code / increase efficiency