Simplified more functions to one liners. :)