minor cleanup for easier reading of code