Cleanup, add other int types, error handling