Made self explicit in all methods.