Lota refactoing going on