changed class names to first character upper case
removed redundant conditions for geometry and removed log messages