Improved separation of different parts of code