Adds logs. Fixes formatting. Moves and renames methods.