Cleaned up source style