removed junk files and cleaned up the code a bit