Random Fixes / Readability