Cleaned up left over debug/testing lines
Added comments and cleaned up long strings