little bit of cleanup for readability