Revert "Fixed some minor issues"

This reverts commit 06826f8f7366bff749c919e1f7831977a350314e.