cleaning
huge refactor to comply to java spec for method