Initial branch commit - cleaned code