Cleaned up code for formatting problems