Cleaning up and refactoring, removed error raises in callbacks