remove unused consts & replaced tabs with spaces