Cleanup (junk code and style)