Code Formatted and cleaned