Tidy up declarations
[WIP]