removed static comments / minor style changes