ENH: Cleaned source code