Small amount of cleanup
added Journal Model