cleaned up style, commenting