It's alive!

Code cleaning and fixing