Cleaned up current code