Added log getting, little bit of cleanup