CLEANUP: make the code look a bit nicer