Moved code and made everything more neat