Polished code and removed py2exe content