Code and files cleaned up