Improvement/general cleanup

Really minor PR. Just removed unused use and some formatting.