Clean up code + make computer less foolish