Made the code ready to be packaged