Cleaned up entire codebase. Improved logging with method names. Resolved some issues generated by gendarme.