Formatting and Slight Changes

Uniformed formatting across all java files and removed the ArrayList
import (it was not needed)