Clean up code. #88