Cleaned up code
Added todo file for ideas