Adjusting to proper code style