styling & code clean up