Code formatting & cleaning redundant using