Cleaned up code formatting and untabify.