Added some clarity and seperation from the original repo