Mega refactoring, CamelCase <3