Refactor code; Fix .class bug