fixed formatting, removed unused code