Got rid of unused usings and corrected minor line spacing issues