rename
reformatting
refactoring n' adding some small things