Cleaned up "last" check