Restructuring
Left only the essential