Final V1 commit

JSHinted and cleaned up