Remove redundant return statements and other tidying up

Removed old Makefile, removed redundant return statements, further formatting changes for PEP8 compliance, moved more inline tests into the tests directory