Refactored the class layout.