Clean up

Final clean up, same as excelsteel.net