fixed import style and added new lines