Cleaned up with large commented sections removed