Change extension and clean code!