Cleaned up and commented random stuff