Remove unnecessary and example code, set proper names, make code more readable/understandable