Decent names and removal of irrelevant stuff