Minor changes to comply with StyleCop