fixing problems in code that occured after fixing code styling