Cleaned up and streamlined some features