Add more changes to accomodate styleguide