Some stuff renamed and removed non-necessary code.