cleaning up files and code a bit