Made a number of class methods private and removed empty lines that were just lingering around.