Removed extras
Structure fix and added coffeelint
Added save wraper