Resolved more warnings/cleaned up some files