+ Minor refactoring, fixed requested issues for commit