Cleaned up code, moved changelog and todo out