Clean up
Better structuring
EOD