Cleaned up the src