Minor changes & cleanup

Just cleaned up some poorly written lines. Nothing about the functionality has changed