Fully qualify apache class
Style cleanup