Cleaned up src