Cleaned Code Up. Final