Cleaned up few implementations