code formatting, console changes
merge