Added Log-Wrapper and cleaned up