using non-static gl fields
some formatting
removed DS_Store files