Cleaned up files. Worked on API