GH-18 Cleaned up code & added info logs