Cleaned up for consistency sake