Cleaned up, fixed inconsistencies