code cleanup , renaming classes, methods for more consistency