Cleaned up for review