removed redundant self references, holy crap guys this is cool