Cleaned up few more functions.