top - style cleanup and removal of unnecessary code