Cleaned up few things