Changed code style according to rubo errors