Cleaned up names and redundancy