Fixed indentation, removed unused code