Cleanup & beautify & assertions