cleaned up code indentation, much prettier