Cleaned up script
Cleaned up further, now a one liner