preparing for rails update, minor style updates