Small changes, naming conventions, comments