Cleaned up source, big time