Cleanup

Cleaned source and improved performances