Cleaned up project, removed some old comments etc.