Removed redundant logging and modified existing logging slightly
Formatting