revisions for cleaner UI

also removed comments