Clean up from merging @roma0104's changes