Cleaned up few lines of code