Removing unnecessary logs. Improving syntax consistency.