IDE warnings and a little reformatting