Cleaned up few things.