Renamed a couple of objects to be more meaningful and made visibility of variables more strict