Cleaned up code appearance