#20 -- Refactor Logs and Fixed Filter

#20