Cleaning

Making code a little more presentable