Cleaned up code for consistency.