Fixed: constant per line
Fixed: remove unused functionality from unexposed method