Clean up, inspected code