cleaner, leaner, meaner

removed clutter, make simpler and faster