improved declaration access levels, removed unnecessary params and rel. imports