Trace method adjustments and help with coding style consistency

I hope you like it!