cleaned up src