Moving declarations
Code cleanup