removed redundant code + code style