Cleaned up & purged redundancy