Cleanup

No need for function prototyping here