removed uneeded library
formatting and efficiency improvements