Clean up!

by Ricardo Gimenes